Make the use of S_ISFIFO and S_ISSOCK conditional. (#150146, Gustavo

Sun Aug 15 02:31:55 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkfilesystemunix.c (get_icon_type_from_stat): Make
	the use of S_ISFIFO and S_ISSOCK conditional.  (#150146,
	Gustavo Carneiro)

diff --git a/ChangeLog b/ChangeLog
index 5cac1e9f5811b3630e517b3a0e503c7792c702c1..13662d8819bb5776af334072077810bae455977b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 15 02:31:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilesystemunix.c (get_icon_type_from_stat): Make 
+       the use of S_ISFIFO and S_ISSOCK conditional.  (#150146,
+       Gustavo Carneiro)
+
 2004-08-14  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_append_home,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5cac1e9f5811b3630e517b3a0e503c7792c702c1..13662d8819bb5776af334072077810bae455977b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Aug 15 02:31:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilesystemunix.c (get_icon_type_from_stat): Make 
+       the use of S_ISFIFO and S_ISSOCK conditional.  (#150146,
+       Gustavo Carneiro)
+
 2004-08-14  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_append_home,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5cac1e9f5811b3630e517b3a0e503c7792c702c1..13662d8819bb5776af334072077810bae455977b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Aug 15 02:31:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilesystemunix.c (get_icon_type_from_stat): Make 
+       the use of S_ISFIFO and S_ISSOCK conditional.  (#150146,
+       Gustavo Carneiro)
+
 2004-08-14  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_append_home,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5cac1e9f5811b3630e517b3a0e503c7792c702c1..13662d8819bb5776af334072077810bae455977b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Aug 15 02:31:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkfilesystemunix.c (get_icon_type_from_stat): Make 
+       the use of S_ISFIFO and S_ISSOCK conditional.  (#150146,
+       Gustavo Carneiro)
+
 2004-08-14  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_append_home,

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 701736317e12ab49e9b90bbd3d4631c1314a69bb..4bb5c212c50534941dafb253623652e28364f71f 100644 (file)
--- a/gtk/gtkfilesystemunix.c
+++ b/gtk/gtkfilesystemunix.c
@@ -590,10 +590,14 @@ get_icon_type_from_stat (struct stat *statp)
     return ICON_CHARACTER_DEVICE;
   else if (S_ISDIR (statp->st_mode))
     return ICON_DIRECTORY;
+#ifdef S_ISFIFO
   else if (S_ISFIFO (statp->st_mode))
     return  ICON_FIFO;
+#endif
+#ifdef S_ISSOCK
   else if (S_ISSOCK (statp->st_mode))
     return ICON_SOCKET;
+#endif
   else
     return ICON_REGULAR;
 }